From 5326da0cc5f1603d5a4d89c78c87ae9ecd57b4b7 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 7 Sep 2011 10:37:20 +0100 Subject: [PATCH] x86: remove unnecessary indirection from irq_complete_move()'s sole parameter Signed-off-by: Jan Beulich --- xen/arch/x86/hpet.c | 2 +- xen/arch/x86/io_apic.c | 9 ++++----- xen/drivers/passthrough/amd/iommu_init.c | 2 +- xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/asm-x86/irq.h | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index a641856323..9263dd2ee6 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -296,7 +296,7 @@ static void hpet_msi_ack(unsigned int irq) { struct irq_desc *desc = irq_to_desc(irq); - irq_complete_move(&desc); + irq_complete_move(desc); move_native_irq(irq); ack_APIC_irq(); } diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index bccd52be8e..53b851b24c 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -518,9 +518,8 @@ static void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress = 0; } -void irq_complete_move(struct irq_desc **descp) +void irq_complete_move(struct irq_desc *desc) { - struct irq_desc *desc = *descp; struct irq_cfg *cfg = desc->chip_data; unsigned vector, me; @@ -1569,7 +1568,7 @@ static void ack_edge_ioapic_irq(unsigned int irq) { struct irq_desc *desc = irq_to_desc(irq); - irq_complete_move(&desc); + irq_complete_move(desc); move_native_irq(irq); if ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) @@ -1648,7 +1647,7 @@ static void mask_and_ack_level_ioapic_irq (unsigned int irq) int i; struct irq_desc *desc = irq_to_desc(irq); - irq_complete_move(&desc); + irq_complete_move(desc); if ( ioapic_ack_new ) return; @@ -1821,7 +1820,7 @@ static void ack_msi_irq(unsigned int irq) { struct irq_desc *desc = irq_to_desc(irq); - irq_complete_move(&desc); + irq_complete_move(desc); move_native_irq(irq); if ( msi_maskable_irq(desc->msi_desc) ) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 1a592329fa..0b24a75e67 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -424,7 +424,7 @@ static void iommu_msi_mask(unsigned int irq) struct amd_iommu *iommu = irq_to_iommu[irq]; struct irq_desc *desc = irq_to_desc(irq); - irq_complete_move(&desc); + irq_complete_move(desc); /* FIXME: do not support mask bits at the moment */ if ( iommu->maskbit ) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 73124e8723..b773e79acb 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -978,7 +978,7 @@ static void dma_msi_mask(unsigned int irq) struct iommu *iommu = irq_to_iommu[irq]; struct irq_desc *desc = irq_to_desc(irq); - irq_complete_move(&desc); + irq_complete_move(desc); /* mask it */ spin_lock_irqsave(&iommu->register_lock, flags); diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h index 8b6c106aab..b6901edad4 100644 --- a/xen/include/asm-x86/irq.h +++ b/xen/include/asm-x86/irq.h @@ -162,7 +162,7 @@ int create_irq(void); void destroy_irq(unsigned int irq); struct irq_desc; -extern void irq_complete_move(struct irq_desc **descp); +extern void irq_complete_move(struct irq_desc *); extern struct irq_desc *irq_desc; -- 2.30.2